cssprovider: Remove GError out argument from load functions

People should use the GtkCssProvider::parsing-error signal instead.

diff --git a/demos/gtk-demo/css_basics.c b/demos/gtk-demo/css_basics.c
index 8bc9af41f59d951a117d57de32891efc1ccef2b1..81e11ce3039cc19e6ccf73d46ccf105c6ac0bcfb 100644 (file)
--- a/demos/gtk-demo/css_basics.c
+++ b/demos/gtk-demo/css_basics.c
@@ -45,7 +45,7 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1, NULL);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 
   gtk_style_context_reset_widgets (gdk_screen_get_default ());

diff --git a/demos/gtk-demo/css_blendmodes.c b/demos/gtk-demo/css_blendmodes.c
index dc41399959508f502f8f0eb84355be15f4cb7c0f..1071b5b32c2c6525ecab8a60a19bf6bd0b3da938 100644 (file)
--- a/demos/gtk-demo/css_blendmodes.c
+++ b/demos/gtk-demo/css_blendmodes.c
@@ -50,7 +50,7 @@ update_css_for_blend_mode (GtkCssProvider *provider,
                          blend_mode,
                          blend_mode);
 
-  gtk_css_provider_load_from_data (provider, css, -1, NULL);
+  gtk_css_provider_load_from_data (provider, css, -1);
 
   g_bytes_unref (bytes);
   g_free (css);

diff --git a/demos/gtk-demo/css_multiplebgs.c b/demos/gtk-demo/css_multiplebgs.c
index a396cffb05a07c24977918e5227ab0d768357c74..cdf5159dce90a03a15fe2d1d9d15da66ec4afe0d 100644 (file)
--- a/demos/gtk-demo/css_multiplebgs.c
+++ b/demos/gtk-demo/css_multiplebgs.c
@@ -45,7 +45,7 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1, NULL);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 
   gtk_style_context_reset_widgets (gdk_screen_get_default ());

diff --git a/demos/gtk-demo/css_pixbufs.c b/demos/gtk-demo/css_pixbufs.c
index 6475ca1c93d739c10cad41461d8543db9b99040a..7155ad712e47e9679db5b6dc177d116c9ca4e753 100644 (file)
--- a/demos/gtk-demo/css_pixbufs.c
+++ b/demos/gtk-demo/css_pixbufs.c
@@ -44,7 +44,7 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1, NULL);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 
   gtk_style_context_reset_widgets (gdk_screen_get_default ());

diff --git a/demos/gtk-demo/css_shadows.c b/demos/gtk-demo/css_shadows.c
index a91759932ac6983292de90c10ddcd09a0a448a5e..53ce92267a228cc147af6c1cd5bc55f09c9276a4 100644 (file)
--- a/demos/gtk-demo/css_shadows.c
+++ b/demos/gtk-demo/css_shadows.c
@@ -43,7 +43,7 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1, NULL);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 
   gtk_style_context_reset_widgets (gdk_screen_get_default ());

diff --git a/demos/gtk-demo/transparent.c b/demos/gtk-demo/transparent.c
index bbbacbe7433520db3778bb40d39079a5b680ca30..bd7a3631598ab59dde6fbc88d826f006fd0717b7 100644 (file)
--- a/demos/gtk-demo/transparent.c
+++ b/demos/gtk-demo/transparent.c
@@ -219,7 +219,7 @@ do_transparent (GtkWidget *do_widget)
       provider = gtk_css_provider_new ();
       css = g_strdup_printf ("* { border-width: 0px %dpx %dpx 0px; }",
                              SHADOW_OFFSET_X, SHADOW_OFFSET_Y);
-      gtk_css_provider_load_from_data (provider, css, -1, NULL);
+      gtk_css_provider_load_from_data (provider, css, -1);
       g_free (css);
       gtk_style_context_add_provider (gtk_widget_get_style_context (entry),
                                       GTK_STYLE_PROVIDER (provider),

diff --git a/examples/plugman.c b/examples/plugman.c
index 82006d60e64261063acd57d2b0c887f296b65c6e..3ce91ab78f19e4f4450c6123fcc04bdf86704442 100644 (file)
--- a/examples/plugman.c
+++ b/examples/plugman.c
@@ -225,7 +225,7 @@ plugin_action (GAction  *action,
   g_message ("Color: %s", g_action_get_name (action));
 
   css_provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (css_provider, css_to_load, -1, NULL);
+  gtk_css_provider_load_from_data (css_provider, css_to_load, -1);
   gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
                                              GTK_STYLE_PROVIDER (css_provider),
                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

diff --git a/gtk/gtk-builder-tool.c b/gtk/gtk-builder-tool.c
index 28e44547d0fd1af9d88b9fd2565b70158bf9c0d5..f3cfbaafd6a5ae5cbc62d02eabf9b3d46362ca4a 100644 (file)
--- a/gtk/gtk-builder-tool.c
+++ b/gtk/gtk-builder-tool.c
@@ -837,11 +837,7 @@ preview_file (const char *filename,
       GtkCssProvider *provider;
 
       provider = gtk_css_provider_new ();
-      if (!gtk_css_provider_load_from_path (provider, cssfile, &error))
-        {
-          g_printerr ("%s\n", error->message);
-          exit (1);
-        }
+      gtk_css_provider_load_from_path (provider, cssfile);
 
       gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
                                                  GTK_STYLE_PROVIDER (provider),

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 2fa91192c549d76fde9512bfe673a114cca44193..d1389492cb1bfe4a12ce14d0f9e6aa08fb418c49 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -154,8 +154,7 @@ static gboolean
 gtk_css_provider_load_internal (GtkCssProvider *css_provider,
                                 GtkCssScanner  *scanner,
                                 GFile          *file,
-                                const char     *data,
-                                GError        **error);
+                                const char     *data);
 
 GQuark
 gtk_css_provider_error_quark (void)
@@ -1052,7 +1051,6 @@ parse_import (GtkCssScanner *scanner)
       gtk_css_provider_load_internal (scanner->provider,
                                       scanner,
                                       file,
-                                      NULL,
                                       NULL);
     }
 
@@ -1719,21 +1717,11 @@ static gboolean
 gtk_css_provider_load_internal (GtkCssProvider *css_provider,
                                 GtkCssScanner  *parent,
                                 GFile          *file,
-                                const char     *text,
-                                GError        **error)
+                                const char     *text)
 {
   GtkCssScanner *scanner;
-  gulong error_handler;
   char *free_data = NULL;
 
-  if (error)
-    error_handler = g_signal_connect (css_provider,
-                                      "parsing-error",
-                                      G_CALLBACK (gtk_css_provider_propagate_error),
-                                      error);
-  else
-    error_handler = 0; /* silence gcc */
-
   if (text == NULL)
     {
       GError *load_error = NULL;
@@ -1793,18 +1781,6 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
 
   g_free (free_data);
 
-  if (error)
-    {
-      g_signal_handler_disconnect (css_provider, error_handler);
-
-      if (*error)
-        {
-          /* We clear all contents from the provider for backwards compat reasons */
-          gtk_css_provider_reset (css_provider);
-          return FALSE;
-        }
-    }
-
   return TRUE;
 }
 
@@ -1815,7 +1791,6 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
  * @length: the length of @data in bytes, or -1 for NUL terminated strings. If
  *   @length is not -1, the code will assume it is not NUL terminated and will
  *   potentially do a copy.
- * @error: (out) (allow-none): return location for a #GError, or %NULL
  *
  * Loads @data into @css_provider, and by doing so clears any previously loaded
  * information.
@@ -1828,8 +1803,7 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
 gboolean
 gtk_css_provider_load_from_data (GtkCssProvider  *css_provider,
                                  const gchar     *data,
-                                 gssize           length,
-                                 GError         **error)
+                                 gssize           length)
 {
   char *free_data;
   gboolean ret;
@@ -1850,7 +1824,7 @@ gtk_css_provider_load_from_data (GtkCssProvider  *css_provider,
 
   gtk_css_provider_reset (css_provider);
 
-  ret = gtk_css_provider_load_internal (css_provider, NULL, NULL, data, error);
+  ret = gtk_css_provider_load_internal (css_provider, NULL, NULL, data);
 
   g_free (free_data);
 
@@ -1863,7 +1837,6 @@ gtk_css_provider_load_from_data (GtkCssProvider  *css_provider,
  * gtk_css_provider_load_from_file:
  * @css_provider: a #GtkCssProvider
  * @file: #GFile pointing to a file to load
- * @error: (out) (allow-none): return location for a #GError, or %NULL
  *
  * Loads the data contained in @file into @css_provider, making it
  * clear any previously loaded information.
@@ -1875,8 +1848,7 @@ gtk_css_provider_load_from_data (GtkCssProvider  *css_provider,
  **/
 gboolean
 gtk_css_provider_load_from_file (GtkCssProvider  *css_provider,
-                                 GFile           *file,
-                                 GError         **error)
+                                 GFile           *file)
 {
   gboolean success;
 
@@ -1885,7 +1857,7 @@ gtk_css_provider_load_from_file (GtkCssProvider  *css_provider,
 
   gtk_css_provider_reset (css_provider);
 
-  success = gtk_css_provider_load_internal (css_provider, NULL, file, NULL, error);
+  success = gtk_css_provider_load_internal (css_provider, NULL, file, NULL);
 
   _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (css_provider));
 
@@ -1908,8 +1880,7 @@ gtk_css_provider_load_from_file (GtkCssProvider  *css_provider,
  **/
 gboolean
 gtk_css_provider_load_from_path (GtkCssProvider  *css_provider,
-                                 const gchar     *path,
-                                 GError         **error)
+                                 const gchar     *path)
 {
   GFile *file;
   gboolean result;
@@ -1919,7 +1890,7 @@ gtk_css_provider_load_from_path (GtkCssProvider  *css_provider,
 
   file = g_file_new_for_path (path);
   
-  result = gtk_css_provider_load_from_file (css_provider, file, error);
+  result = gtk_css_provider_load_from_file (css_provider, file);
 
   g_object_unref (file);
 
@@ -1957,7 +1928,7 @@ gtk_css_provider_load_from_resource (GtkCssProvider *css_provider,
   file = g_file_new_for_uri (uri);
   g_free (uri);
 
-  gtk_css_provider_load_from_file (css_provider, file, NULL);
+  gtk_css_provider_load_from_file (css_provider, file);
 
   g_object_unref (file);
 }
@@ -2159,7 +2130,7 @@ _gtk_css_provider_load_named (GtkCssProvider *provider,
       if (resource != NULL)
         g_resources_register (resource);
 
-      gtk_css_provider_load_from_path (provider, path, NULL);
+      gtk_css_provider_load_from_path (provider, path);
 
       /* Only set this after load, as load_from_path will clear it */
       provider->priv->resource = resource;

diff --git a/gtk/gtkcssprovider.h b/gtk/gtkcssprovider.h
index 6044731b7a5de0e1025941ea7781667f4188f2d9..4ed011a7d66d93d6837399cc43baeffb2da91d75 100644 (file)
--- a/gtk/gtkcssprovider.h
+++ b/gtk/gtkcssprovider.h
@@ -97,16 +97,13 @@ char *           gtk_css_provider_to_string      (GtkCssProvider  *provider);
 GDK_AVAILABLE_IN_ALL
 gboolean         gtk_css_provider_load_from_data (GtkCssProvider  *css_provider,
                                                   const gchar     *data,
-                                                  gssize           length,
-                                                  GError         **error);
+                                                  gssize           length);
 GDK_AVAILABLE_IN_ALL
 gboolean         gtk_css_provider_load_from_file (GtkCssProvider  *css_provider,
-                                                  GFile           *file,
-                                                  GError         **error);
+                                                  GFile           *file);
 GDK_AVAILABLE_IN_ALL
 gboolean         gtk_css_provider_load_from_path (GtkCssProvider  *css_provider,
-                                                  const gchar     *path,
-                                                  GError         **error);
+                                                  const gchar     *path);
 
 GDK_AVAILABLE_IN_3_16
 void             gtk_css_provider_load_from_resource (GtkCssProvider *css_provider,

diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index b1e0000da07289c15fb0374ed1bc80fa8d36a8e7..ab40312ef4ff4226eb88c6c04ba7dce44e450521 100644 (file)
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -1320,7 +1320,7 @@ gtk_font_button_label_use_font (GtkFontButton *font_button)
         pango_font_description_unset_fields (desc, PANGO_FONT_MASK_SIZE);
 
       data = pango_font_description_to_css (desc);
-      gtk_css_provider_load_from_data (priv->provider, data, -1, NULL);
+      gtk_css_provider_load_from_data (priv->provider, data, -1);
 
       g_free (data);
       pango_font_description_free (desc);

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index db367f6e2ea64c1014af103c1614dc3e582f3a7a..3cd15ddc78477dd292760a61dd4d918b575bbfc0 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1856,7 +1856,7 @@ settings_init_style (GtkSettings *settings)
 
       if (g_file_test (css_path,
                        G_FILE_TEST_IS_REGULAR))
-        gtk_css_provider_load_from_path (css_provider, css_path, NULL);
+        gtk_css_provider_load_from_path (css_provider, css_path);
 
       g_free (css_path);
     }

diff --git a/gtk/inspector/css-editor.c b/gtk/inspector/css-editor.c
index 51d646ba95b470fbf3470b6a1c90f4aba7669250..ad77e02de03fa273522f81619f1a077f524d799d 100644 (file)
--- a/gtk/inspector/css-editor.c
+++ b/gtk/inspector/css-editor.c
@@ -225,7 +225,7 @@ update_style (GtkInspectorCssEditor *ce)
   ce->priv->errors = NULL;
 
   text = get_current_text (ce->priv->text);
-  gtk_css_provider_load_from_data (ce->priv->provider, text, -1, NULL);
+  gtk_css_provider_load_from_data (ce->priv->provider, text, -1);
   g_free (text);
 }
 

diff --git a/tests/animated-revealing.c b/tests/animated-revealing.c
index 8b4ca877c6f4d804ef1ce86698be83c55d2842de..11b3f99bcede836b6cb73f8f87b83ea4ecb6419a 100644 (file)
--- a/tests/animated-revealing.c
+++ b/tests/animated-revealing.c
@@ -54,7 +54,7 @@ main(int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (revealer), grid);
 
   cssprovider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (cssprovider, "* { padding: 2px; text-shadow: 5px 5px 2px grey; }", -1, NULL);
+  gtk_css_provider_load_from_data (cssprovider, "* { padding: 2px; text-shadow: 5px 5px 2px grey; }", -1);
 
   for (x = 0; x < 10; x++)
     {

diff --git a/tests/styleexamples.c b/tests/styleexamples.c
index 10df38de3f3f5bb3c0d387027e13420ff98fc716..636d26b8eb0b10b2adc82b71e04ada56741da983 100644 (file)
--- a/tests/styleexamples.c
+++ b/tests/styleexamples.c
@@ -353,7 +353,7 @@ int main (int argc, char *argv[])
                                    "   border-style: solid;\n"
                                    "   border-width: 1;\n"
                                    "   border-radius: 0;\n"
-                                   "}\n", -1, NULL);
+                                   "}\n", -1);
   gtk_style_context_add_provider (context, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
   g_signal_connect_after (ebox, "draw", G_CALLBACK (draw_cb), NULL);

diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index e2cea6b6b06e993f9b9a0d97df47b59f5c449685..f3aa635f72f19c09e07826fd725be73e0035d089 100644 (file)
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -403,7 +403,7 @@ main (int argc, char *argv[])
   gtk_css_provider_load_from_data (provider,
     ".black-bg { background-color: black; }"
     ".red-bg { background-color: red; }"
-    ".blue-bg { background-color: blue; }", -1, NULL);
+    ".blue-bg { background-color: blue; }", -1);
   gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
                                              GTK_STYLE_PROVIDER (provider),
                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

diff --git a/tests/testbaseline.c b/tests/testbaseline.c
index 220b197e78d8a3b2786cc961be07e0596a457110..2ae81c5ac384ab1ee8868e7e662d364789c8b879 100644 (file)
--- a/tests/testbaseline.c
+++ b/tests/testbaseline.c
@@ -82,7 +82,7 @@ main (int    argc,
   gtk_css_provider_load_from_data (provider,
     ".small-font { font-size: 5px; }"
     ".medium-font { font-size: 10px; }"
-    ".large-font { font-size: 15px; }", -1, NULL);
+    ".large-font { font-size: 15px; }", -1);
   gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
                                              GTK_STYLE_PROVIDER (provider),
                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

diff --git a/tests/testboxcss.c b/tests/testboxcss.c
index bf19a793cda54d257535f7dbf8a5eafcff257017..517e530d1c577023b81f7f6a125b7a7724304cb4 100644 (file)
--- a/tests/testboxcss.c
+++ b/tests/testboxcss.c
@@ -82,7 +82,7 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1, NULL);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 
   gtk_style_context_reset_widgets (gdk_screen_get_default ());

diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index de0d4f106f7c7d3ec9296d5813296d339e7d5ca6..aec6406d323e898c2cfe374df9b160b6445ad31e 100644 (file)
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -262,7 +262,7 @@ void calendar_select_font (GtkWidget    *button,
         }
       font = gtk_font_button_get_font_name (GTK_FONT_BUTTON (button));
       data = g_strdup_printf ("GtkCalendar { font: %s; }", font);
-      gtk_css_provider_load_from_data (provider, data, -1, NULL);
+      gtk_css_provider_load_from_data (provider, data, -1);
       g_free (data);
     }
 }

diff --git a/tests/testcombo.c b/tests/testcombo.c
index c0880d161fd4a68811832767d5a0e3fd4ff019d1..eeff0aba15084e19734933300d90d8d0579932a6 100644 (file)
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -1070,7 +1070,7 @@ main (int argc, char **argv)
 
            gtk_css_provider_load_from_data (provider,
                                             "* { -GtkComboBox-appears-as-list: true; }", 
-                                            -1, NULL);
+                                            -1);
 
            gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
                                                       GTK_STYLE_PROVIDER (provider),

diff --git a/tests/testcombochange.c b/tests/testcombochange.c
index c8c7762840905698b0894f62bf7ae9b78156895b..b74477baa3488e424a917ce2a0924d40e924884b 100644 (file)
--- a/tests/testcombochange.c
+++ b/tests/testcombochange.c
@@ -93,7 +93,7 @@ create_combo (const char *name,
   provider = gtk_css_provider_new ();
   css_data = g_strdup_printf ("#%s { -GtkComboBox-appears-as-list: %s }",
                               name, is_list ? "true" : "false");
-  gtk_css_provider_load_from_data (provider, css_data, -1, NULL);
+  gtk_css_provider_load_from_data (provider, css_data, -1);
   g_free (css_data);
 
   gtk_style_context_add_provider (context,

diff --git a/tests/testframe.c b/tests/testframe.c
index 7410c6eef7e7b786d08ff1a1261d4db9099a2e87..9fc2f9037d143d9671f6daa3a8d8d7d3cdb28581 100644 (file)
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -48,7 +48,7 @@ spin_ythickness_cb (GtkSpinButton *spin, gpointer user_data)
                           pad.top,
                           (gint)gtk_spin_button_get_value (spin));
 
-  gtk_css_provider_load_from_data (provider, data, -1, NULL);
+  gtk_css_provider_load_from_data (provider, data, -1);
   g_free (data);
 
   gtk_widget_queue_resize (frame);
@@ -84,7 +84,7 @@ spin_xthickness_cb (GtkSpinButton *spin, gpointer user_data)
                           (gint)gtk_spin_button_get_value (spin),
                           pad.left);
 
-  gtk_css_provider_load_from_data (provider, data, -1, NULL);
+  gtk_css_provider_load_from_data (provider, data, -1);
   g_free (data);
 
   gtk_widget_queue_resize (frame);

diff --git a/tests/testgrid.c b/tests/testgrid.c
index 394caacedfc5d1c65a5b15e1395b921922736508..37e2d79e78f0c10bed7e34ed483330078fdce052 100644 (file)
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -13,7 +13,7 @@ oriented_test_widget (const gchar *label, const gchar *color, gdouble angle)
   box = gtk_event_box_new ();
   provider = gtk_css_provider_new ();
   data = g_strdup_printf ("GtkEventBox { background-color: %s; }", color);
-  gtk_css_provider_load_from_data (provider, data, -1, NULL);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_add_provider (gtk_widget_get_style_context (box),
                                   GTK_STYLE_PROVIDER (provider),
                                   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

diff --git a/tests/testgtk.c b/tests/testgtk.c
index ab0b5b40d4a09d35d04e0bbae9954b13cc81ae3a..7a73e70da9e56707398de3c9d5a196939378f425 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -9258,9 +9258,9 @@ main (int argc, char *argv[])
    * directory.
    */
   if (file_exists ("testgtk.css"))
-    gtk_css_provider_load_from_path (provider, "testgtk.css", NULL);
+    gtk_css_provider_load_from_path (provider, "testgtk.css");
   else if (file_exists ("tests/testgtk.css"))
-    gtk_css_provider_load_from_path (provider, "tests/testgtk.css", NULL);
+    gtk_css_provider_load_from_path (provider, "tests/testgtk.css");
   else
     g_warning ("Couldn't find file \"testgtk.css\".");
 
@@ -9337,7 +9337,7 @@ main (int argc, char *argv[])
                                    "  font-family: Sans;\n"
                                    "  font-size: 18px;\n"
                                    "}",
-                                   -1, NULL);
+                                   -1);
   gtk_style_context_add_provider_for_screen (screen, GTK_STYLE_PROVIDER (memory_provider),
                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION + 1);
 

diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index 26a4d7200fcb1bbe5394aad3e992ff79eaa6a423..c766e4ce49352f3b0c7588f71c89a82d9d7e9523 100644 (file)
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
   gtk_style_context_add_class (gtk_widget_get_style_context (window), "main");
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, css, -1, NULL);
+  gtk_css_provider_load_from_data (provider, css, -1);
   gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (window),
                                              GTK_STYLE_PROVIDER (provider),
                                              GTK_STYLE_PROVIDER_PRIORITY_USER);

diff --git a/tests/testiconview-keynav.c b/tests/testiconview-keynav.c
index 31253639b9acd0fc77929b96a2674bb10d9f07e3..f38c4535e6508033b9a15b7052576c8e7e199ef4 100644 (file)
--- a/tests/testiconview-keynav.c
+++ b/tests/testiconview-keynav.c
@@ -220,7 +220,7 @@ set_styles (void)
 
   provider = gtk_css_provider_new ();
 
-  if (!gtk_css_provider_load_from_data (provider, CSS, -1, NULL))
+  if (!gtk_css_provider_load_from_data (provider, CSS, -1))
     {
       g_assert_not_reached ();
     }

diff --git a/tests/testlevelbar.c b/tests/testlevelbar.c
index 233d216871d4af50b9a9bad8a91e18d2d541a88b..ccf4141cbd0ec640eae49ac1c08d0653e156a66e 100644 (file)
--- a/tests/testlevelbar.c
+++ b/tests/testlevelbar.c
@@ -34,7 +34,7 @@ add_custom_css (void)
   "}";
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, data, -1, NULL);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
                                              GTK_STYLE_PROVIDER (provider),
                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

diff --git a/tests/testlist.c b/tests/testlist.c
index a96722bf87d651f817437572bb0b2a5ff9616ccf..06f98fd311a49faec75fdd055208283400003465 100644 (file)
--- a/tests/testlist.c
+++ b/tests/testlist.c
@@ -262,7 +262,7 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (window), hbox);
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, css, -1, NULL);
+  gtk_css_provider_load_from_data (provider, css, -1);
   gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (window),
                                              GTK_STYLE_PROVIDER (provider),
                                              GTK_STYLE_PROVIDER_PRIORITY_USER);

diff --git a/tests/testoverlay.c b/tests/testoverlay.c
index 1ea1bd7ce4d8977dde1639218d9ce4bdd7c2eeba..88a8be95f25e7a53e64bc28024e8cde2022ef8db 100644 (file)
--- a/tests/testoverlay.c
+++ b/tests/testoverlay.c
@@ -555,7 +555,7 @@ main (int argc, char *argv[])
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);
 
   css_provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (css_provider, css, -1, NULL);
+  gtk_css_provider_load_from_data (css_provider, css, -1);
   gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
                                              GTK_STYLE_PROVIDER (css_provider),
                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c
index 28a10bd531eeb901e03ead04bbe9838ccbc8de66..f93eba616dfdc26f8b638f1e56c5a047fb174f40 100644 (file)
--- a/tests/testoverlaystyleclass.c
+++ b/tests/testoverlaystyleclass.c
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
                                    ".bottom { border-bottom-style: none; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; }"
                                    ".left { border-left-style: none; border-top-left-radius: 0px; border-bottom-left-radius: 0px; }"
                                    ".right { border-right-style: none; border-top-right-radius: 0px; border-bottom-right-radius: 0px; }",
-                                   -1, NULL);
+                                   -1);
   gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
                                              GTK_STYLE_PROVIDER (provider),
                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

diff --git a/testsuite/gtk/cssprovider.c b/testsuite/gtk/cssprovider.c
index e6381caf8d0ed1f5bb28bf866548ddc02238d3e8..c0d2c88d2e12e3afd547e256ee547bdfb711e41f 100644 (file)
--- a/testsuite/gtk/cssprovider.c
+++ b/testsuite/gtk/cssprovider.c
@@ -17,7 +17,7 @@ test_section_in_load_from_data (void)
   provider = gtk_css_provider_new ();
   g_signal_connect (provider, "parsing-error",
                     G_CALLBACK (assert_section_is_not_null), NULL);
-  gtk_css_provider_load_from_data (provider, "random garbage goes here", -1, NULL);
+  gtk_css_provider_load_from_data (provider, "random garbage goes here", -1);
   g_object_unref (provider);
 }
 
@@ -33,7 +33,7 @@ test_section_in_style_property (void)
   provider = gtk_css_provider_new ();
   g_signal_connect (provider, "parsing-error",
                     G_CALLBACK (assert_section_is_not_null), NULL);
-  gtk_css_provider_load_from_data (provider, "* { -GtkWindow-decoration-button-layout: random garbage goes here; }", -1, NULL);
+  gtk_css_provider_load_from_data (provider, "* { -GtkWindow-decoration-button-layout: random garbage goes here; }", -1);
 
   widget_class = g_type_class_ref (GTK_TYPE_WINDOW);
   pspec = gtk_widget_class_find_style_property (widget_class, "decoration-button-layout");
@@ -58,7 +58,7 @@ test_section_load_nonexisting_file (void)
   provider = gtk_css_provider_new ();
   g_signal_connect (provider, "parsing-error",
                     G_CALLBACK (assert_section_is_not_null), NULL);
-  gtk_css_provider_load_from_path (provider, "this/path/does/absolutely/not/exist.css", NULL);
+  gtk_css_provider_load_from_path (provider, "this/path/does/absolutely/not/exist.css");
   g_object_unref (provider);
 }
 

diff --git a/testsuite/gtk/firefox-stylecontext.c b/testsuite/gtk/firefox-stylecontext.c
index 1a581fe06e51bb418672e8b9e19d3ee9e6aaa843..86dc1ee5f04ffc30c72d94df6e3675f3118d5341 100644 (file)
--- a/testsuite/gtk/firefox-stylecontext.c
+++ b/testsuite/gtk/firefox-stylecontext.c
@@ -34,7 +34,7 @@ test_init_of_theme (void)
   css = g_strdup_printf (".background { color: %s; }",
                          before.alpha < 0.5 ? "black" : "transparent");
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, css, -1, NULL);
+  gtk_css_provider_load_from_data (provider, css, -1);
   gtk_style_context_add_provider (context,
                                   GTK_STYLE_PROVIDER (provider),
                                   GTK_STYLE_PROVIDER_PRIORITY_FALLBACK + 1);

diff --git a/testsuite/gtk/stylecontext.c b/testsuite/gtk/stylecontext.c
index 8df88a852d4d3e5e584e9719b124b40b905b4c1f..91d6b8d9355bd0a5312a8e6fa1687b091de62a9c 100644 (file)
--- a/testsuite/gtk/stylecontext.c
+++ b/testsuite/gtk/stylecontext.c
@@ -11,7 +11,6 @@ static void
 test_parse_selectors (void)
 {
   GtkCssProvider *provider;
-  GError *error;
   gboolean res;
   gint i;
   const gchar *valid[] = {
@@ -58,14 +57,10 @@ test_parse_selectors (void)
      NULL
   };
 
-  error = NULL;
   for (i = 0; valid[i]; i++)
     {
       provider = gtk_css_provider_new ();
-      res = gtk_css_provider_load_from_data (provider, valid[i], -1, &error);
-      if (error)
-        g_print ("parsing '%s': got unexpected error: %s\n", valid[i], error->message);
-      g_assert_no_error (error);
+      res = gtk_css_provider_load_from_data (provider, valid[i], -1);
       g_assert (res);
 
       g_object_unref (provider);
@@ -131,12 +126,10 @@ test_match (void)
   GtkStyleContext *context;
   GtkWidgetPath *path;
   GtkCssProvider *provider;
-  GError *error;
   const gchar *data;
   GdkRGBA color;
   GdkRGBA expected;
 
-  error = NULL;
   provider = gtk_css_provider_new ();
 
   gdk_rgba_parse (&expected, "#fff");
@@ -160,78 +153,68 @@ test_match (void)
                                   GTK_STYLE_PROVIDER_PRIORITY_USER);
 
   data = "* { color: #fff }";
-  gtk_css_provider_load_from_data (provider, data, -1, &error);
-  g_assert_no_error (error);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_get_color (context, &color);
   g_assert (gdk_rgba_equal (&color, &expected));
 
   data = "* { color: #f00 }\n"
          "button { color: #fff }";
-  gtk_css_provider_load_from_data (provider, data, -1, &error);
-  g_assert_no_error (error);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_get_color (context, &color);
   g_assert (gdk_rgba_equal (&color, &expected));
 
   data = "* { color: #f00 }\n"
          "button { color: #fff }\n"
          "window > button { color: #000 }";
-  gtk_css_provider_load_from_data (provider, data, -1, &error);
-  g_assert_no_error (error);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_get_color (context, &color);
   g_assert (gdk_rgba_equal (&color, &expected));
 
   data = "* { color: #f00 }\n"
          ".button { color: #fff }";
-  gtk_css_provider_load_from_data (provider, data, -1, &error);
-  g_assert_no_error (error);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_get_color (context, &color);
   g_assert (gdk_rgba_equal (&color, &expected));
 
   data = "* { color: #f00 }\n"
          "button { color: #000 }\n"
          ".button { color: #fff }";
-  gtk_css_provider_load_from_data (provider, data, -1, &error);
-  g_assert_no_error (error);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_get_color (context, &color);
   g_assert (gdk_rgba_equal (&color, &expected));
 
   data = "* { color: #f00 }\n"
          "button { color: #000 }\n"
          "window button { color: #fff }";
-  gtk_css_provider_load_from_data (provider, data, -1, &error);
-  g_assert_no_error (error);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_get_color (context, &color);
   g_assert (gdk_rgba_equal (&color, &expected));
 
   data = "* { color: #f00 }\n"
          ".button { color: #000 }\n"
          "window .button { color: #fff }";
-  gtk_css_provider_load_from_data (provider, data, -1, &error);
-  g_assert_no_error (error);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_get_color (context, &color);
   g_assert (gdk_rgba_equal (&color, &expected));
 
   data = "* { color: #f00 }\n"
          "* .button { color: #000 }\n"
          "#mywindow .button { color: #fff }";
-  gtk_css_provider_load_from_data (provider, data, -1, &error);
-  g_assert_no_error (error);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_get_color (context, &color);
   g_assert (gdk_rgba_equal (&color, &expected));
 
   data = "* { color: #f00 }\n"
          "window .button { color: #000 }\n"
          "window#mywindow .button { color: #fff }";
-  gtk_css_provider_load_from_data (provider, data, -1, &error);
-  g_assert_no_error (error);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_get_color (context, &color);
   g_assert (gdk_rgba_equal (&color, &expected));
 
   data = "* { color: #f00 }\n"
          "window .button { color: #000 }\n"
          "window button.button { color: #fff }";
-  gtk_css_provider_load_from_data (provider, data, -1, &error);
-  g_assert_no_error (error);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_get_color (context, &color);
   g_assert (gdk_rgba_equal (&color, &expected));
 
@@ -239,8 +222,7 @@ test_match (void)
          "window:backdrop .button { color: #000 }\n"
          "window .button { color: #111 }\n"
          "window:active .button { color: #fff }";
-  gtk_css_provider_load_from_data (provider, data, -1, &error);
-  g_assert_no_error (error);
+  gtk_css_provider_load_from_data (provider, data, -1);
   gtk_style_context_get_color (context, &color);
   g_assert (gdk_rgba_equal (&color, &expected));
 
@@ -354,19 +336,15 @@ static void
 test_style_priorities_setup (PrioritiesFixture *f,
                              gconstpointer      unused)
 {
-  GError *error = NULL;
   f->blue_provider = gtk_css_provider_new ();
   f->red_provider = gtk_css_provider_new ();
   f->green_provider = gtk_css_provider_new ();
   f->context = gtk_style_context_new ();
   GtkWidgetPath *path = gtk_widget_path_new ();
 
-  gtk_css_provider_load_from_data (f->blue_provider, "* { color: blue; }", -1, &error);
-  g_assert_no_error (error);
-  gtk_css_provider_load_from_data (f->red_provider, "* { color: red; }", -1, &error);
-  g_assert_no_error (error);
-  gtk_css_provider_load_from_data (f->green_provider, "* { color: green; }", -1, &error);
-  g_assert_no_error (error);
+  gtk_css_provider_load_from_data (f->blue_provider, "* { color: blue; }", -1);
+  gtk_css_provider_load_from_data (f->red_provider, "* { color: red; }", -1);
+  gtk_css_provider_load_from_data (f->green_provider, "* { color: green; }", -1);
 
   gtk_widget_path_append_type (path, GTK_TYPE_WINDOW);
   gtk_style_context_set_path (f->context, path);